Modify architeture
Resolve conflit