[#59] AuthenticatedSystem refactored