Used more injected class names to reduce code.
Used injected class name.
Show how to use geo2d and geo3d wrappers.