Modernization of some old utility modules.
Modernization.
Update docs.