Updated decorator