Experiment with changes in language for handling event registration. Remove 'Command' and 'CommandHandler'