Some work on Accessors infrastructure. Code e clean-up.