Added additional support for metadata initialization.