Changes related to serialization and commands