Move default variable handler into extension