Added proper support for redraw option