Fixed typehint
Restructured accessor inheritence hierarchy