Modified several callbacks to use the new command decorator.