Add COR support