Added util class