Added more models and ensured they work with admin and the populate script