adding support for geometry