Expanding 'Choice' in School Choice