Split more metadata out