Changes for showing more metadata