Added migrations
Clean up and eager loading