devcommand-34 Refactor to plugin architecture
devcommand-34 Refactor to plugin architecture