Bug Fix - Initial functionality for the import 'problem' of delete/inser...

Fix build and introduced functionality for import problem