renamed and change implementation for Image class