Add Normlize 2.1.0 and seperate out legacy version