Further metadata improvements