Move towards singleton approach, save image urls