Add Cluebringer support