Added some initial image handling