Design pattern and LPA updates
Merge