Cleanup and adding schema file.