Add support for geometric types