Added more metadata fields