Improved generic service layer, autowire generic types.