Include riverstone. We're up to 90+ dictionaries, 3k+ ATTRIBUTEs,