Changing to be a utility class