Added unit and metadata_structure info