Added variables for xptemplate