Developing a New Framework of Waqf Management