Changed JSon property mapper