Updated to include serialization.