Add some geometry classes