Decorator changes

Henk!