Update for FW-native