Commands and Events part added