Changed data structures. Message update mechanism is improved