Extracted ArchitectureExtensions from Architecture
Model: Tweaked Dependency and Restriction
Solver: Misc tweaks