Improvements for De-Serialization code

Cleanup some deprecated method usage in the De-Serialization code
 - https://hibernate.atlassian.net/browse/HSEARCH-1596