Added basic support for Storage/Mediator interaction