Fix new API structure