Fix input parsing to understand incremental abi