Adapted to API