Adjusted set/get to handle substructure sets/gets