changed hierachy for better view on HashMaps