Add nested escapes support