Buildscript fixes and added a schema