MB-135 #Added service and server back into db