Updated path and image class