simplified models.py, improved schema