Add separate class for generating geometry diagrams