Make the metadata builder optional