More API refectoring