Added admin fields and migration
merged