Added util-classes