Added support for less sytax