Major improvement of plugins and commands