Some preparations for future sync features