Fix tabulation
Add 'macro' namespace in import support