Updates to model and admin