Switch to versioned schemas, add in query list file (currently not used for all queries