Better handling of default decorations