Revamp completion of Feature, Algorithms and Metric