Added convert util class