Add selfs.
Split const to utils.