Reorganised metadata system