Add PluginDataManager and CommandHandler