Added enum serialization