LPS-32565 move method to the Base