Add bundle tracker logic and configuration