move  typeSafetyPolicy to Infrastructure.