Add coffee and ctag