Add indexes
Udpate admin classes
Add constraints