Changed main architecture