Changed the schema for User