Update Math & CollectionsUtil