[HELIX-389] Unify accessor classes into a single class