Update samples
Start refactoring basecustomjobcontroller