Added gender, role and terms fields