Added support for less variables