Update to use new commander