Added ability to add additional criteria to search
Added stub for easier combining of rules into base model