Added general per-machine customization