Add metadata type table and mapper
Merge