Added output files and changed debug-names to use schema search