Architecture issues fixed