Added support for commandEvents

Change-Id: I7f0e711e0a5b9ca39aebe04735d918158b6b5745