Added custom User model support