Use new API in CodeService