tmp hack
Parser optimisation
minor
Break up pipeling listener into multiple methods