LPS-34188 Missing inputs after refactorization