Avoid NullPointer Map
Add GeometricLayer