Adding CASTOR.