[COS] Refactoring