Added some Cantemo specific changes