Reorganize FCM detector