More CAF changes