Preparing to support multiple APIs