Cont.

Need to refine js\src\infrastructure\utils