Add image support
