You can expect some changes in the forms. They'll ask for the last 5 years instead of 6 and they'll also have a provision to gather information regarding to addresses you lived in Canada before becoming PR. So, you should definitely wait for the new forms, because the current ones won't be valid and don't make sense under the new law, as you've noticed.Thanks for the information. To be on the safe side I will state detail for the last four year, since Feb 2013 (time spent in Canada which they call relevant period) and you are right, I will wait till 6C is implemented.