Align E2EE API with existing one