Changes to speed up creating of status and status map (Laurent)

No match.