Added image support to demo