Updated old commands to use new APIs