Changes in API and implementation