Fixed: import error with primary key = 0
Updated import functions