* ADDED: Decorator implementation.