Adding value type to metadata classes