Refactored BehaviorExtension to decorator