Added more metadata information