Add multipoint feature support. Refs #4