Updated to cdi rc1