Improve image management