Optimisation separate subline. Add keys in parser.