Added more Commands & Events