Refactory the ICommandHandler and IEventHandler wrapper design.