Added support for Custom User Models