Add in control fields and migration