Restored the code to use Map