Refactor to add/update entries and assets into an other space