LPS-48253 Use new API

Hey John, could you please take a look at this one?

Regards,