Done changes in matrix answer and updated the references of Validity
and AccessRights enums.