We have two different schemas right now with overlapping contents -- one for the server and one for the compiler. Need to merge the overlaps.