Added code that handles each subsystem's id, it no longer must be manually set