Moving internal API (#90)