Little change to the exapi