Add new utilities and slight changes