Add support for adding CustomDataPoints