Feature/3 metadata types

This is done, unless there's any specific metadata type we can't think of that has given us problems in the past.