Added offset_window support