Add Image Class for [NFR] #902