Tweak to migration in order to accomodate old names for data fields and allow for if data fields were not present