Added parsing to filter messages & log where required