metadata improvements