Added options to give context to finder