Updates to work in new user directory scheme
Updates to ISvc and IBeta classes