Changed specific HashMap to more general Map