Added type and units