Added support for coffee, changes in API.