Updated header paths