Refactor Type and Finder_method changes to the Host module