Work on normalizing the custom DB queries via the SQL object