Improving models
Updating admin