Changes to API mechanism