added Metadata support