Added code for geometry as hash instead of string