Updated architecture
Still trying to resolve conflicts