Access refactoring