new onrun decorator support