Added more stuff for images