Reordered properties

Change-Id: I9a10a5b76f9711e681b9c54ba20f6fb37fe32cf2