Enhance Spotter module