LPS-42340 Add minimal functional logic