Added ranking and composite index