Update API to fix inconsistent linkage warnings