[build] functions rewriting update