Added misc events and stubbed classes