Added data structures to take into account basic object types + evaluate arithmetic operations