Add more functions on Organization and Volunteer