use new serve hooks