Fix algorithm (more unweighted graph-oriented)
Use BoneCP
Use Primitive Collections