CONN-1033:Fix ServiceImpl classes