LPS-30425 - Move new methods to module and private function