Add image support and images