API parsing changes