A fresh and comrehensive disaster management plan for every school of Brihan-mumbai Municipal Corporation (BMC), post the November 30 violent protests in parts of Maharashtra, will be in place by 2007. The project is being devised in association with the United Nations Development Programme (UNDP).