Resolve #9 - Decorator