Enrolment options

Self-enrolment-BasicRAII
Self-enrolment-BasicRAII