Added type arguments to Comparable