Updated models for custom user model support.