Updated geometry classes to use @property