Refactor added class job