Did some kinda tidying up of the Import logic
Added more values to the import list