Added type vars