decorator improvements