Better support for local image when creating a collection