Changed the way arguments are handled inside the Where class functions and Join class functions