Initial implementation of MetadataBuilder for issue #170