Improved config
Separated lock file from pid file