Added support for variable type