Add Family changes and added the migration back after merging from develop.