diff --git a/Architecture.md b/Architecture.md
index 2e724d1..2698c53 100644
--- a/Architecture.md
+++ b/Architecture.md
@@ -1,6 +1,6 @@
-This project (OIDC-JSS) is intended to be a standalone OpenID Connect Server. Extension and customization of this server can be accomplished by configuration through Spring configuration files, injected functionality through new Beans, and overlay of views and static resources (using Maven War Overlay or similar functionality). We currently support the Authorization Code flow, and intend to eventually support others.
+The MITREid Connect server project is intended to be a standalone OpenID Connect Server. Extension and customization of this server can be accomplished by configuration through Spring configuration files, injected functionality through new Beans, and overlay of views and static resources (using Maven War Overlay or similar functionality). We currently support the Authorization Code flow, and intend to eventually support others.
 
-OIDC-JSS is built on Spring 3.1 and Spring Security 3.1, making heavy use of the OAuth2 module of Spring Security OAuth (SECOAUTH)*. Wherever sensible, we have tried to make use of existing functionality in SECOAUTH, Spring, and Spring Security. Because of this, much of the functionality of OIDC-JSS is hidden in Spring context configuration files and may not be readily apparent when examining the codebase. This architecture document will attempt to lay out which portions of the server implementation reside in our own code, and which portions are delegated to the SECOAUTH library.
+MITREid Connect is built on Spring 3.1 and Spring Security 3.1, making heavy use of the OAuth2 module of Spring Security OAuth (SECOAUTH)*. Wherever sensible, we have tried to make use of existing functionality in SECOAUTH, Spring, and Spring Security. Because of this, much of the functionality of MITREid Connect is hidden in Spring context configuration files and may not be readily apparent when examining the codebase. This architecture document will attempt to lay out which portions of the server implementation reside in our own code, and which portions are delegated to the SECOAUTH library.
 
 We are using JPA with Eclipselink and either an internal HSQL or external MySQL databases for token, client, and user data persistence. 
 
@@ -16,17 +16,24 @@ The project uses a multi-level Maven and git repository structure. The main proj
 
 We are using the SECOAUTH 'authorization-server' element in our spring-servlet.xml (Spring configuration file, in openid-connect-server src/main/webapp/WEB-INF). This element stands up several SECOAUTH beans, and allows customization by injecting replacements for some of their default beans. 
 
-    <oauth:authorization-server client-details-service-ref="defaultOAuth2ClientDetailsEntityService" 
-		token-services-ref="defaultOAuth2ProviderTokenService" token-granter-ref="authCodeTokenGranter"
-		user-approval-handler-ref="userApprovalHandler" authorization-endpoint-url="/openidconnect/auth" token-endpoint-url="/openidconnect/token">
-        <oauth:authorization-code authorization-code-services-ref="authCodeServices" />
-    </oauth:authorization-server>
-    <bean id="authCodeTokenGranter" class="org.springframework.security.oauth2.provider.code.AuthorizationCodeTokenGranter">
-        <constructor-arg name="tokenServices" ref="defaultOAuth2ProviderTokenService"/>
-        <constructor-arg name="authorizationRequestFactory" ref="authorizationRequestFactory"/>
-	<constructor-arg name="authorizationCodeServices" ref="authCodeServices"/>
-    </bean>
+```
+	<oauth:authorization-server 
+		client-details-service-ref="defaultOAuth2ClientDetailsEntityService"
+		authorization-request-manager-ref="authorizationRequestManager" 
+		token-services-ref="defaultOAuth2ProviderTokenService" 
+		user-approval-handler-ref="tofuUserApprovalHandler" 
+		authorization-endpoint-url="/authorize" 
+		token-endpoint-url="/token">
+		
+		<oauth:authorization-code authorization-code-services-ref="defaultOAuth2AuthorizationCodeService"/>
+		<oauth:implicit />
+		<oauth:refresh-token/>
+		<oauth:client-credentials/>
+		<oauth:custom-grant token-granter-ref="chainedTokenGranter" />
+		<oauth:custom-grant token-granter-ref="jwtAssertionTokenGranter" />
 
+	</oauth:authorization-server>
+```
 
 Following is a list of the important SECOAUTH beans we are using out-of-the-box. This is not an exhaustive list; but these beans contain most of the functionality that we care about:
  * org.springframework.security.oauth2.endpoint.AuthorizationEndpoint