- Added future variable support.