Refactored data path handling into class with static instance gate