Changed part code to use infoset Retrieve/Store