Cleaning up build environment
Also adding schema support per class