[PATCH] Improve job file parsing