Add map and tweak init