Add identifier as metadata and fix some unicode problems