Initial Clearwater code changes