Added line and message parser