Feature/158 refactor jobs