Added huge image support