Better support for metadata updates