Adding cas support