Metadata improvements