Update utils and build process