Added SqlBuilder class to break up code more