add anotated name to metadata attributes, fix parser