Added backward support for Metadata