Serialization changes
Merge pull request #1064 from ManishKataria/master

Serialization changes