Redesign of accessors
Resolver + tests