Add initial support for variables