SAWUML is a general-purpose software modeling language that extends UML by unifying component and sequence diagrams for the specifications of software architectures.While component diagram is used for modeling the system structures, sequence diagram is extended with the Design-by-Contract approach for the modeling of system behaviors.In this paper, we aim at enhancing the language usability by providing alternative modeling choices for practitioners.To this end, we extended SAWUML's notation set with UML's activity diagram for the behavior modeling.So, practitioners may now use either sequence or activity diagrams, while the system structures are still modeled with component diagrams.We also extended SAWUML's modeling editor for creating software architecture models together with component and activity diagrams and the code generators for automatically obtaining (i) formal models in SPIN's ProMeLa for formal verification and (ii) Java-based implementation.We illustrate our language extension with the gas station case-study.