Adding support and test for custom finder