Updated model code to work with Django 1.5
Module import fix