Updated API structure