ImageRenderer improvements