More work on decorator