Some message modifications
Added first simple detection handling