refactoring to new access api