More API standardization