Update for BK + enroll

Update for BK + enroll