Make some changes about architecture