Further improved API.