DEV-64 | change some code & add util lib