Update commands to new interface. Next step is to use HelpFunc where needed