Added support for points