Refactored bundle detection and recording