Added support for mach, minimac, and trinity