Utility class updates