Remove "magic formula" from the access implementation. Start refactoring