API design updates