More commands complying to new format