Added extra commands to plugin.yml to fix NPE