Image management enhancements