bla
Brought back the metadata handling from the first implementation