TMDM-7517: code refactoring - using non static methods