Re add image overlay support