Add support for variables within nests