Changes for Django 1.6. More inheritance from Django. No validation atm