Add detection of other messages

Add detection of other messages