Added support for most types of variables;