Changed the schema a bit