Added service persistence