Added @var support