Added geometry classes.