update to make all components Serializable