Make SData and Transport are more clear.