The Governments Division of the U.S. Census Bureau is responsible for maintaining a universe of state and local governments. This maintenance process involves tracking changes in the existence status of government units, maintaining current contact information, and ensuring complete and unduplicated universe coverage. The quality of this universe directly impacts the quality of the surveys that use the universe as a frame. Therefore, the Division continues to develop ways to improve the survey universe. Two recent initiatives launched by the Division to improve the universe of state and local governments are the development of a new database system, the Governments Master Address File (GMAF), and a new directory survey, the Government Units Survey (GUS). This paper outlines the development of the GMAF, which at its completion will house the universe of state and local governments and their dependent agencies and the GUS, which is part of the 2012 Census of Governments.