Switched format of functions to accept only options hash
Added filter support