find module enhancements