More changes to support building static schema for reference