Updated to support Cilex