Add 'Util'-class for mapping etc.