Added importer skeletons
Small fixes