Added Escape support