Threat Modeling Revisited: Improving Expressiveness of Attack Nets