Moved parser into jobs