Added a map, updated the init.