Improve image impl