Updated to work with multiimage fields