Some modifications in CodeModel