Refactor lpa registration