[COS] Smaller changes for the design