Added more places, changed map key