First round of Accessor.build refactoring