Changed the way variables data are resolved