Add Utility, refactor graph