make architecture more simple