Fix
Add configurable variables