Updated Service and ServiceException