Merged API functionality with new structure