Testing new API structure