Updated base service struct