[FEATURE] Improve code migration towards FAL