Improved object de-serialization