Adding support for dynamic finders