More changes to decorators