Added service support