Using clause objects to make query parts more consistant
Corrected Join signatures
Added Between Expression