*8148* refactor to parent class