Adding support for custom user models