Added service name support to fpm