[Wen Hao] - refactor properties.
[Wen Hao] - refactor properties.