Added Coffee support