Ensure the main supervisor state is included