Added CommandManager and MessageManager