Added support for variables starting with an underscore