Query Builder Base changes