Update utils and common