Added scheme support for inputs