Escaper interface restructure