Created a single map, avoided two map