Starting new, revised architecture
Search loose coupling improvement