ServiceAdapter namespace fixed