Add UpdateableIndexSet and FirstOrDefault extension