Fix #83 - add message counter to add/update scenario messages