Change space settings, refactor sync logic