Added multi-image support