Added re-worked query builders DSL