Adding ComakeIt code