Resolving serialization issues