Refactor parameter scope to work better with ENCs