Updated includes to be protocol agnostic