Last refactoring caused problem - accidentially deleten imporatant
class. Reverted.