Adding ability to add additional where statements