Added factory extension for COR