Add fields to STO and change mapper