Messages refactoring
Parsing of messages moved to companion object
Fixed override compilation error