Class based processors
Merge remote-tracking branch 'splittingred/pr/23' into pr-23