Refactored towards MediatR.