Slimmed down Soql builder