Moved construction logic into ProjectIndexJob.apply