Changed message handling for new parser, added object-description