Updates to service layer and base service