Updated api/core