The scope should also cover frontier workers and family members irrespective of their place of residence.
A definition of the rights to be protected - the scope should mirror existing rights, in other words:
residence rights and rights of free movement derived from the TFEU and Directive 2004/38
the rights and obligations set out in Regulation 883/2004 on the coordination of social security systems and in the implementing Regulation 883/2004
the rights set out in Regulation 492/2011 on freedom of movement for workers (e.g. access to the labour market, to pursue an activity, social and tax advantages, training, housing, collective rights as well as rights of workers' family members to be admitted to general educational, apprenticeship and vocational training courses under the same conditions as the nationals of the host State)
the right to take up and pursue self-employment derived from Article 49 of the TFEU