Revised updated enrollment schema =D