Added support for POINT and POLYGON types.