Added scheme support and test file.