Updating to workaround List Object serialization