More metadata reorganization