Implemented Metadata handling