More work on access preset refactoring