Removing [DoNotSerialize] attribute to fix build