Rework to satisfy API structure