Added support for Ipoints