Typofix
Moved generic functions to utils