FCM Editor updates