Small changes on Metadata