More refactoring and new style accessor