Added extra fields to cadet model