serving-layer -> serving for consistency