Refactored OPImageItem to OPItem