Build changes for new schema