Adding support for custom User model