Minor changes
Changes in API and implementation
Changes in API and implementation