LP-143 refactoring