Change dependent code to use new registerSubtype mechanism for runtime deserialization