Fix new bug in QueryBuilder
New Database Schema build files