Changed GSH map etc to static to be used from Command, since in same pacage now