A refactoring of the tol-enrollments building block