Added support to decorate specific keys back.