Why do we have to duplicate the generator search logic. Can't we expose the package in the generator system somehow?