[FEATURE] Improved translation handling for statement generation