Moved the parsing of demand and split ratios