Map update etc. added