Changing metadata format and adding qualified name class