Move all geometry creation to geometry utils