Changed the schema again