Added immutable empty Metadata static instance
Using Metadata everywhere