Added error messages
Added custom user model