Added visitor generation option