Adding support for 8 images