LPS-47520 Uses the new method in the places is needed