Added variable resolver