Fix file name concatenation bug
Add scheduler and replace stopper