Added checks for the systems that need to be registered.