Added Form Users and corrected classes