Added migration and more work on admin