Add SystemName and SystemLocation axe