Macro expanasion option added