Added functionalities to the enrollment wizzard