CoSE: General improvements