Added service implementations