Add multipoint support