Changed the origin of CpG island annotations and added CpG class.