Added support for custom user models