Little spy fix
Add table for map
Add working spy