Adding utils and updating main