performance optimizations
Complete refactoring of importer
Importer test cases added