Refactored to new system identicication