added possibility to decorate command mappings