Systems are now keyed by name