Add new models and update username to store email address