- Improved variables support