Some changes before transmit to server