More updates to the generic service pattern.