Refactor controller
Merge remote-tracking branch 'origin/classifier' into classifier