QueryBuilder imvrovement. Changed schema format