Added basic image_list support