Added service infrastructure