LPS-38402 Moving logic to the back end