Add a find module to remove code duplication