Preparing for the upcoming API