Metadata form improved