API format changed a bit