Added username to model for email