District Mayor Vincent Gray announced Monday that 16 former public school buildings would be made available for public charters and other community organizations to use.

The move comes amidst growing demand for charter school spots in the city. Roughly 22,000 students were on public charter waitlists this year, up from about 15,000 last year, the Public Charter School Board announced earlier this month.