Refactor to expose some methods so that it can be inherited [MB-11160]

MB-11160