OPEN - task 21: Unified class logic with logic other classes
https://github.com/regidev/mte/issues/issue/21