Improve support with Coffeetag