Moved heads to the endpoint struct