Modified commands to use new mediator