Slim it down; make 'decide what to support' optional