Removed class 'Variable', now using Term only