Changing models to support custom user models

Changing models to support custom users.