When it comes to self-employed persons, in addition to the amendments already described, we propose that the domicile criteria should be made more stringent, and that we should make provision for the possibility of countering any abuse in the way of bogus self-employment.