Added APIImages fields to support to API version < 1.7 and > 1.9