Improving support for coffee, still not ready