A more complete decorator