use runtime to populate enrollment values where possible

use runtime to populate enrollment values where possible #997