Added support for points and dimensions.