More Student scenario additions