Refactoring the subsystem reader.