refactoring properties class, add actions in mediator