Fixed the schema, have to execute things in the right order!