Updated to compile with the new input providers