Change the .service class behavior

#96