Added some basic functionality for types and variables