Added ESC support