Improve components (make components serializable)