FHD bugfix: models for migration