Move commands to the plugin