Case class instead of tuple
Revised multiple image output