Moving job id to a more appropriate place