Added username field to User model