Rebase import

Implementation of saving objects on import