This remained the city's governing structure in 1993, when former President Raúl Alfonsín prevailed on his successor, President Carlos Menem, to agree to a limited devolution of governing powers to the city (the Olivos Pact). Accordingly, the 1994 reform of the Argentine Constitution included article 129, which guaranteed Buenos Aires greater self-governance. The "Indentente" ("appointed Mayor") was replaced by a "Jefe de Gobierno" (elected Mayor), and the city council by the Buenos Aires City Legislature. Shortly before the historic, June 30, 1996, elections to these posts, however, a senior Peronist Senator, Antonio Cafiero, succeeded in limiting the city's autonomy by advancing National Law 24.588, which reserved control of the 25,000-strong "Policía Federal" (the federally administered city police), the Port of Buenos Aires and other faculties to the national government. The controversial bill, signed in 1996 by President Menem, remained a sticking point between successive Presidents (most of whom have been Peronist) and Buenos Aires Mayors (none of whom have been). A 2005 agreement on principles between Mayor Aníbal Ibarra and President Néstor Kirchner was followed by the modification of the especially contentious article 7, which denied the city its own, local police force, in 2007 - though the "Cafiero Law" otherwise remains in force. Efforts since 2007 by Mayor Mauricio Macri to declare it unconstitutional have thus far failed, and though the Mayor inaugurated a Metropolitan Police, issues of revenue sharing for its financing remain pending.