Decorator?  Might be overkill.