Changed the razon manager architecture
Resolved conflicts