CHANGE: Add more configuration-vars