Added more gallery support.