LP-143 Refactoring