Added username field to user model