More prep work for IPC API