Improved templates variables