Extended model and added command line importer (to be fixed)