Added stageId <--> jobId mapping along with
some renaming and IDE warning suppression