Angular Updates
Refactor Sample for Composite Key