added metadata related changes