[Improve] Optimize application design