Added support for geometry option (not fully tested).