Added support for simple variables in definitions