Add more strict message analyzer