Access refactoring
Access refactoring