Tiny cleanup
Add upgrade modifier config