Adding rudimentary image support