#52 Add mechanism for machine-specific properties