oasp/oasp4j#83: Architecture updated to results of workshop