The Senate unanimously approved legislation Wednesday revamping how local pensions for police officers and firefighters are funded, bringing closer to resolution a long-running debate over the retirement plans.

The bill (SB 172), which now heads to the House, cleared the upper chamber 36-0 after less than 10 minutes of debate. It relies on a deal struck between cities and unions last year—one that cities have backed away from after the re-election of Gov. Rick Scott in November.