public-api structure fix