Bug fix and extra fields on image object.