Improve utility class