Preparing for making API public