Add mac_* commands
Improve the paths