Added image support for locations and events