Updated geometry component for v4