Remove redundant variable and imports
Add serialization/deserialization to a ListValue when multiple is true