Updated api style