Map added and fixed