Added a util class