Includes host changes