Initial changes to db including user model