Update to support opts[:image]