Added support for new properties variables resolver