Added & expression for constraints
Changed Functional Architecture concepts