Before event/command refactor.