Finalised CQueryStatement and CQueryCondition, need to work on CUnitQueryCondition.