Changed to use serialized metadata