Major changes wrt CMAKE transition