These methods moved to the util class