Added wantlist option