New classes for the return type, and changes to the has_access function and tests to make them compatible.
