Changed base service to use proper type casting