enhance image retain context architecture