Added voms mapping and tenant selection.