Updated to use new commands syntax.