Updated job parsing