Some changes. Using OpenHashMaps