Add support for custom User model