Preparing for API break up. #25