Feature/enrol upgrade