refactor with uid-safe
2.0.0