OZP-16 Fixed serialization issues