UPDATED CONVERTER TO INCLUDE METADATA