Updated geometry class