Adding utils and some other updates