Issue #37 Changes for volunteers-dev