More refactorings. More classes, less lines. AccessService