Respect new developmental api