Utility class modified