More work on the decorator