Added and integrated image class