Improve Component serialization