LPS-47775 SF - move more code to the backend