added more event and command classes