Updated to use new commands format.