Modified schema and user model