Added partial support for serialization.
Merge branch 'master' into admin