Refactor
Refactor
Add enforcement to POI