adding unit and label parsing