Update util code
Code from other projects