Added serialization of components