[FEATURE] Extend FCE migration  - Closes: #13