Upgrade version
Refactor coffee