Adding line parsing and keyword sniffing