Architecture improvements based on Glenn's feedback