Code cleanup, ComponentsConfig serializable