ApI minor changes