Update for Caustic changes