Improved analysis result
Various fixes; Message type definition