Align implementation with pe_server changes