RevisionService refactoring