Updated Image Class