Add ability to do optional params for custom query