More API compliance