Added support to any image type