Allow different input sets for cfd