Added code-units to the collection of utilities