More update to enrollment API